From 41486895d5c59ebe049a57e2083f3987fe15ddf6 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 25 Nov 2012 04:16:43 +0100 Subject: [PATCH] deprecations: Move files into deprecated/ dir --- gtk/Makefile.am | 17 ++++++++++------- gtk/{ => deprecated}/gtkgradient.c | 0 gtk/{ => deprecated}/gtkgradient.h | 2 +- gtk/{ => deprecated}/gtkgradientprivate.h | 0 gtk/{ => deprecated}/gtksymboliccolor.c | 0 gtk/{ => deprecated}/gtksymboliccolor.h | 0 gtk/{ => deprecated}/gtksymboliccolorprivate.h | 2 +- gtk/gtk.h | 4 ++-- gtk/gtkcsscolorvalue.c | 1 - gtk/gtkcsscustomproperty.c | 3 ++- gtk/gtkcssimagegradient.c | 5 +++-- gtk/gtkcssimagegradientprivate.h | 2 +- gtk/gtkcssstylefuncs.c | 6 +++--- gtk/gtkstylecontext.c | 5 +++-- gtk/gtkstyleproperties.c | 7 +++---- 15 files changed, 29 insertions(+), 25 deletions(-) rename gtk/{ => deprecated}/gtkgradient.c (100%) rename gtk/{ => deprecated}/gtkgradient.h (98%) rename gtk/{ => deprecated}/gtkgradientprivate.h (100%) rename gtk/{ => deprecated}/gtksymboliccolor.c (100%) rename gtk/{ => deprecated}/gtksymboliccolor.h (100%) rename gtk/{ => deprecated}/gtksymboliccolorprivate.h (96%) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index aa8145f745..f0659f1285 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -148,6 +148,7 @@ deprecated_h_sources = \ deprecated/gtkcolorsel.h \ deprecated/gtkcolorseldialog.h \ deprecated/gtkfontsel.h \ + deprecated/gtkgradient.h \ deprecated/gtkhandlebox.h \ deprecated/gtkhbbox.h \ deprecated/gtkhbox.h \ @@ -156,8 +157,9 @@ deprecated_h_sources = \ deprecated/gtkhscrollbar.h \ deprecated/gtkhseparator.h \ deprecated/gtkhsv.h \ - deprecated/gtkstyle.h \ deprecated/gtkrc.h \ + deprecated/gtkstyle.h \ + deprecated/gtksymboliccolor.h \ deprecated/gtktable.h \ deprecated/gtktearoffmenuitem.h \ deprecated/gtkvbbox.h \ @@ -167,6 +169,10 @@ deprecated_h_sources = \ deprecated/gtkvseparator.h \ deprecated/gtkvpaned.h +deprecated_private_h_sources = \ + deprecated/gtkgradientprivate.h \ + deprecated/gtksymboliccolorprivate.h + gtk_public_h_sources = \ gtk.h \ gtkx.h \ @@ -249,7 +255,6 @@ gtk_public_h_sources = \ gtkfontchooserdialog.h \ gtkfontchooserwidget.h \ gtkframe.h \ - gtkgradient.h \ gtkgrid.h \ gtkiconfactory.h \ gtkicontheme.h \ @@ -330,7 +335,6 @@ gtk_public_h_sources = \ gtkstyleproperties.h \ gtkstyleprovider.h \ gtkswitch.h \ - gtksymboliccolor.h \ gtktestutils.h \ gtktextattributes.h \ gtktextbuffer.h \ @@ -478,7 +482,6 @@ gtk_private_h_sources = \ gtkfilesystemmodel.h \ gtkfontchooserprivate.h \ gtkfontchooserutils.h \ - gtkgradientprivate.h \ gtkhslaprivate.h \ gtkiconcache.h \ gtkiconhelperprivate.h \ @@ -527,7 +530,6 @@ gtk_private_h_sources = \ gtkstylepropertiesprivate.h \ gtkstylepropertyprivate.h \ gtkstyleproviderprivate.h \ - gtksymboliccolorprivate.h \ gtktextbtree.h \ gtktextbufferserialize.h \ gtktextchildprivate.h \ @@ -556,6 +558,7 @@ deprecated_c_sources = \ deprecated/gtkcolorsel.c \ deprecated/gtkcolorseldialog.c \ deprecated/gtkfontsel.c \ + deprecated/gtkgradient.c \ deprecated/gtkhandlebox.c \ deprecated/gtkhbbox.c \ deprecated/gtkhbox.c \ @@ -566,6 +569,7 @@ deprecated_c_sources = \ deprecated/gtkhsv.c \ deprecated/gtkrc.c \ deprecated/gtkstyle.c \ + deprecated/gtksymboliccolor.c \ deprecated/gtktable.c \ deprecated/gtktearoffmenuitem.c \ deprecated/gtkvbbox.c \ @@ -721,7 +725,6 @@ gtk_base_c_sources = \ gtkfontchooserutils.c \ gtkfontchooserwidget.c \ gtkframe.c \ - gtkgradient.c \ gtkgrid.c \ gtkhsla.c \ gtkiconcache.c \ @@ -824,7 +827,6 @@ gtk_base_c_sources = \ gtkstyleprovider.c \ gtkstyleproviderprivate.c \ gtkswitch.c \ - gtksymboliccolor.c \ gtktestutils.c \ gtktextattributes.c \ gtktextbtree.c \ @@ -973,6 +975,7 @@ gtk_private_h_sources += $(gtk_use_quartz_private_h_sources) endif gtk_all_private_h_sources = \ + $(deprecated_private_h_sources) \ $(gtk_private_h_sources) \ $(gtk_use_x11_private_h_sources) \ $(gtk_use_win32_private_h_sources) \ diff --git a/gtk/gtkgradient.c b/gtk/deprecated/gtkgradient.c similarity index 100% rename from gtk/gtkgradient.c rename to gtk/deprecated/gtkgradient.c diff --git a/gtk/gtkgradient.h b/gtk/deprecated/gtkgradient.h similarity index 98% rename from gtk/gtkgradient.h rename to gtk/deprecated/gtkgradient.h index 52bbb2e0ac..767461f4e4 100644 --- a/gtk/gtkgradient.h +++ b/gtk/deprecated/gtkgradient.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include G_BEGIN_DECLS diff --git a/gtk/gtkgradientprivate.h b/gtk/deprecated/gtkgradientprivate.h similarity index 100% rename from gtk/gtkgradientprivate.h rename to gtk/deprecated/gtkgradientprivate.h diff --git a/gtk/gtksymboliccolor.c b/gtk/deprecated/gtksymboliccolor.c similarity index 100% rename from gtk/gtksymboliccolor.c rename to gtk/deprecated/gtksymboliccolor.c diff --git a/gtk/gtksymboliccolor.h b/gtk/deprecated/gtksymboliccolor.h similarity index 100% rename from gtk/gtksymboliccolor.h rename to gtk/deprecated/gtksymboliccolor.h diff --git a/gtk/gtksymboliccolorprivate.h b/gtk/deprecated/gtksymboliccolorprivate.h similarity index 96% rename from gtk/gtksymboliccolorprivate.h rename to gtk/deprecated/gtksymboliccolorprivate.h index 154c29fbac..abbee19a89 100644 --- a/gtk/gtksymboliccolorprivate.h +++ b/gtk/deprecated/gtksymboliccolorprivate.h @@ -18,7 +18,7 @@ #ifndef __GTK_SYMBOLIC_COLOR_PRIVATE_H__ #define __GTK_SYMBOLIC_COLOR_PRIVATE_H__ -#include "gtk/gtksymboliccolor.h" +#include "gtk/deprecated/gtksymboliccolor.h" #include "gtk/gtkcssparserprivate.h" #include "gtk/gtkcssvalueprivate.h" diff --git a/gtk/gtk.h b/gtk/gtk.h index bd9d5f4ae5..fbc06a3641 100644 --- a/gtk/gtk.h +++ b/gtk/gtk.h @@ -107,7 +107,6 @@ #include #include #include -#include #include #include #include @@ -185,7 +184,6 @@ #include #include #include -#include #include #include #include @@ -229,6 +227,7 @@ #include #include #include +#include #include #include #include @@ -239,6 +238,7 @@ #include #include #include +#include #include #include #include diff --git a/gtk/gtkcsscolorvalue.c b/gtk/gtkcsscolorvalue.c index 06337869b0..0486e28f60 100644 --- a/gtk/gtkcsscolorvalue.c +++ b/gtk/gtkcsscolorvalue.c @@ -24,7 +24,6 @@ #include "gtkhslaprivate.h" #include "gtkstylepropertyprivate.h" #include "gtkstyleproperties.h" -#include "gtksymboliccolorprivate.h" #include "gtkwin32themeprivate.h" typedef enum { diff --git a/gtk/gtkcsscustomproperty.c b/gtk/gtkcsscustomproperty.c index 1a304afb47..017a8a22e1 100644 --- a/gtk/gtkcsscustomproperty.c +++ b/gtk/gtkcsscustomproperty.c @@ -26,9 +26,10 @@ #include "gtkcssstylefuncsprivate.h" #include "gtkcsstypedvalueprivate.h" #include "gtkstylepropertiesprivate.h" -#include "gtksymboliccolor.h" #include "gtkthemingengine.h" +#include "deprecated/gtksymboliccolor.h" + G_DEFINE_TYPE (GtkCssCustomProperty, _gtk_css_custom_property, GTK_TYPE_CSS_STYLE_PROPERTY) static GType diff --git a/gtk/gtkcssimagegradient.c b/gtk/gtkcssimagegradient.c index fa6aacf2ab..cc06c904c9 100644 --- a/gtk/gtkcssimagegradient.c +++ b/gtk/gtkcssimagegradient.c @@ -24,8 +24,9 @@ #include "gtkcssimagegradientprivate.h" #include "gtkcssprovider.h" -#include "gtkgradientprivate.h" -#include "gtksymboliccolorprivate.h" + +#include "deprecated/gtkgradientprivate.h" +#include "deprecated/gtksymboliccolorprivate.h" G_DEFINE_TYPE (GtkCssImageGradient, _gtk_css_image_gradient, GTK_TYPE_CSS_IMAGE) diff --git a/gtk/gtkcssimagegradientprivate.h b/gtk/gtkcssimagegradientprivate.h index 6ab2cbd865..48754357a2 100644 --- a/gtk/gtkcssimagegradientprivate.h +++ b/gtk/gtkcssimagegradientprivate.h @@ -22,7 +22,7 @@ #include "gtk/gtkcssimageprivate.h" -#include +#include G_BEGIN_DECLS diff --git a/gtk/gtkcssstylefuncs.c b/gtk/gtkcssstylefuncs.c index f399881f9f..af1c1b1b6f 100644 --- a/gtk/gtkcssstylefuncs.c +++ b/gtk/gtkcssstylefuncs.c @@ -33,15 +33,15 @@ #include "gtkcssrgbavalueprivate.h" #include "gtkcsstypedvalueprivate.h" #include "gtkcsstypesprivate.h" -#include "gtkgradient.h" -#include "gtkgradientprivate.h" #include "gtkprivatetypebuiltins.h" #include "gtkstylecontextprivate.h" -#include "gtksymboliccolorprivate.h" #include "gtkthemingengine.h" #include "gtktypebuiltins.h" #include "gtkwin32themeprivate.h" +#include "deprecated/gtkgradientprivate.h" +#include "deprecated/gtksymboliccolorprivate.h" + /* this is in case round() is not provided by the compiler, * such as in the case of C89 compilers, like MSVC */ diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index 46822e27dc..8da3682125 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -29,7 +29,6 @@ #include "gtkcssnumbervalueprivate.h" #include "gtkcssrgbavalueprivate.h" #include "gtkdebug.h" -#include "gtkgradientprivate.h" #include "gtkstylepropertiesprivate.h" #include "gtktypebuiltins.h" #include "gtkthemingengineprivate.h" @@ -37,7 +36,6 @@ #include "gtkwidget.h" #include "gtkwindow.h" #include "gtkprivate.h" -#include "gtksymboliccolorprivate.h" #include "gtkiconfactory.h" #include "gtkwidgetpath.h" #include "gtkwidgetprivate.h" @@ -46,6 +44,9 @@ #include "gtksettings.h" #include "gtksettingsprivate.h" +#include "deprecated/gtkgradientprivate.h" +#include "deprecated/gtksymboliccolorprivate.h" + /** * SECTION:gtkstylecontext * @Short_description: Rendering UI elements diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c index e98cd44c44..9788006b16 100644 --- a/gtk/gtkstyleproperties.c +++ b/gtk/gtkstyleproperties.c @@ -24,9 +24,7 @@ #include #include "gtkstyleprovider.h" -#include "gtksymboliccolor.h" #include "gtkthemingengine.h" -#include "gtkgradient.h" #include "gtkcssshorthandpropertyprivate.h" #include "gtkcsstypedvalueprivate.h" #include "gtkcsstypesprivate.h" @@ -36,10 +34,11 @@ #include "gtkstylepropertyprivate.h" #include "gtkstyleproviderprivate.h" #include "gtkintl.h" - -#include "gtksymboliccolorprivate.h" #include "gtkwin32themeprivate.h" +#include "deprecated/gtkgradient.h" +#include "deprecated/gtksymboliccolorprivate.h" + /** * SECTION:gtkstyleproperties * @Short_description: Store for style property information -- 2.30.2